From 26f7973d6ae16f77e44319c2598a7a366ddaa0ee Mon Sep 17 00:00:00 2001
From: "kaf24@firebug.cl.cam.ac.uk" <kaf24@firebug.cl.cam.ac.uk>
Date: Sun, 19 Mar 2006 14:02:18 +0100
Subject: [PATCH] Apply Xen build system changes to all non-arch
 subdirectories.

Signed-off-by: Keir Fraser <keir@xensource.com>
---
 xen/Post.mk               | 10 +++++++---
 xen/Rules.mk              | 12 +++---------
 xen/acm/Makefile          | 18 ++++++------------
 xen/common/Makefile       | 38 +++++++++++++++++++++++++++-----------
 xen/drivers/acpi/Makefile | 10 ++--------
 xen/drivers/char/Makefile | 10 ++++------
 6 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/xen/Post.mk b/xen/Post.mk
index e765893760..89a1d085ae 100644
--- a/xen/Post.mk
+++ b/xen/Post.mk
@@ -1,15 +1,19 @@
 
 subdirs-all := $(subdirs-y) $(subdirs-n)
 
-default: $(subdirs-y)
+obj-y += $(patsubst %,%/built_in.o,$(subdirs-y))
+
+default: built_in.o
+built_in.o: $(obj-y)
+	$(LD) $(LDFLAGS) -r -o $@ $^
 
 .PHONY: FORCE
 FORCE:
 
-%/: FORCE
+%/built_in.o: FORCE
 	$(MAKE) -C $*
 
 clean: $(addprefix _clean_, $(subdirs-all))
+	rm -f *.o *~ core
 _clean_%/: FORCE
 	$(MAKE) -C $* clean
-
diff --git a/xen/Rules.mk b/xen/Rules.mk
index ce51931923..b134449f98 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -41,18 +41,12 @@ S_SRCS  := $(wildcard *.S)
 OBJS    := $(patsubst %.S,%.o,$(S_SRCS))
 OBJS    += $(patsubst %.c,%.o,$(C_SRCS))
 
-ALL_OBJS-y :=
-CFLAGS-y   :=
-subdirs-y  :=
-subdirs-n  :=
-
 include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
 
 # Note that link order matters!
-ALL_OBJS-y               += $(BASEDIR)/common/common.o
-ALL_OBJS-y               += $(BASEDIR)/drivers/char/driver.o
-ALL_OBJS-$(HAS_ACPI)     += $(BASEDIR)/drivers/acpi/driver.o
-ALL_OBJS-$(ACM_SECURITY) += $(BASEDIR)/acm/acm.o
+ALL_OBJS-y               += $(BASEDIR)/common/built_in.o
+ALL_OBJS-y               += $(BASEDIR)/drivers/built_in.o
+ALL_OBJS-$(ACM_SECURITY) += $(BASEDIR)/acm/built_in.o
 ALL_OBJS-y               += $(BASEDIR)/arch/$(TARGET_ARCH)/arch.o
 
 CFLAGS-y               += -g -D__XEN__
diff --git a/xen/acm/Makefile b/xen/acm/Makefile
index b212041afa..a3656e905a 100644
--- a/xen/acm/Makefile
+++ b/xen/acm/Makefile
@@ -1,15 +1,9 @@
-
 include $(BASEDIR)/Rules.mk
-OBJS =  acm_core.o 
-OBJS += acm_policy.o
-OBJS += acm_simple_type_enforcement_hooks.o
-OBJS += acm_chinesewall_hooks.o
-OBJS += acm_null_hooks.o
-
-default: acm.o
 
-acm.o: $(OBJS)
-	$(LD) $(LDFLAGS) -r -o acm.o $(OBJS)
+obj-y += acm_core.o 
+obj-y += acm_policy.o
+obj-y += acm_simple_type_enforcement_hooks.o
+obj-y += acm_chinesewall_hooks.o
+obj-y += acm_null_hooks.o
 
-clean:
-	rm -f *.o *~ core
+include $(BASEDIR)/Post.mk
diff --git a/xen/common/Makefile b/xen/common/Makefile
index 516adbc8f4..6f6d6c6c54 100644
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -1,19 +1,35 @@
 
 include $(BASEDIR)/Rules.mk
 
-ifneq ($(perfc),y)
-OBJS := $(subst perfc.o,,$(OBJS))
-endif
-ifneq ($(crash_debug),y)
-OBJS := $(patsubst gdbstub.o,,$(OBJS))
-endif
+obj-y += acm_ops.o
+obj-y += bitmap.o
+obj-y += dom0_ops.o
+obj-y += domain.o
+obj-y += elf.o
+obj-y += event_channel.o
+obj-y += grant_table.o
+obj-y += kernel.o
+obj-y += keyhandler.o
+obj-y += lib.o
+obj-y += memory.o
+obj-y += multicall.o
+obj-y += page_alloc.o
+obj-y += rangeset.o
+obj-y += sched_bvt.o
+obj-y += sched_sedf.o
+obj-y += schedule.o
+obj-y += softirq.o
+obj-y += string.o
+obj-y += symbols.o
+obj-y += trace.o
+obj-y += timer.o
+obj-y += vsprintf.o
+obj-y += xmalloc.o
 
-default: common.o
-common.o: $(OBJS)
-	$(LD) $(LDFLAGS) -r -o common.o $(OBJS)
+obj-$(perfc)       += perfc.o
+obj-$(crash_debug) += gdbstub.o
 
-clean:
-	rm -f *.o *~ core
+include $(BASEDIR)/Post.mk
 
 # Object file contains changeset and compiler information.
 kernel.o: $(BASEDIR)/include/xen/compile.h
diff --git a/xen/drivers/acpi/Makefile b/xen/drivers/acpi/Makefile
index 21e5243004..88b7ad93a6 100644
--- a/xen/drivers/acpi/Makefile
+++ b/xen/drivers/acpi/Makefile
@@ -1,11 +1,5 @@
-
 include $(BASEDIR)/Rules.mk
 
-OBJS := tables.o
-
-default: driver.o
-driver.o: $(OBJS)
-	$(LD) $(LDFLAGS) -r -o driver.o $(OBJS)
+obj-y += tables.o
 
-clean:
-	rm -f *.o *~ core
+include $(BASEDIR)/Post.mk
diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
index 9633fb7134..40fc709764 100644
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -1,12 +1,10 @@
-
 include $(BASEDIR)/Rules.mk
 
-default: driver.o
-driver.o: $(OBJS)
-	$(LD) $(LDFLAGS) -r -o driver.o $(OBJS)
+obj-y += console.o
+obj-y += ns16550.o
+obj-y += serial.o
 
-clean:
-	rm -f *.o *~ core
+include $(BASEDIR)/Post.mk
 
 # Object file contains changeset and compiler information.
 console.o: $(BASEDIR)/include/xen/compile.h
-- 
2.30.2